Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Mon, 5 Jun 2017 02:29:33 +0000 (22:29 -0400)
committerTom Rini <[email protected]>
Mon, 5 Jun 2017 02:29:33 +0000 (22:29 -0400)

Trivial merge